Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@src/renderer/components/TerminalOutput.tsx`:
- Around line 920-924: The fork button currently passes the rendered list index
(index from filteredLogs) to onForkConversation, which causes slicing of
sourceTab.logs at the wrong position; instead pass a raw log boundary that
identifies the original message in sourceTab.logs (e.g., pass the log's unique
id or compute its index in sourceTab.logs and pass that), or simply pass the log
object itself and let useForkConversation locate the correct index by matching
id/timestamp; update the button's onClick from onForkConversation(index) to
onForkConversation(logId || originalIndex || log) and adjust useForkConversation
to resolve the true sourceTab.logs index before slicing.

In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Around line 31-42: The fork serializer currently drops image-backed turns by
only using log.text and hardcoding hasImages: false; update
useForkConversation's formatting logic (see formattedContext and slicedLogs) to
preserve attachment data by including each log's attachments/hasImages metadata
when present (e.g., carry attachments array or a flag alongside the role/text),
and compute a derived hasImages = slicedLogs.some(l => l.attachments?.length >
0) to pass into the spawn/fork call instead of false; also mirror the same
preservation for the other serializer path referenced around spawn (the block
that currently sets hasImages: false) so the forked conversation receives the
original attachments and image flag.
- Around line 80-96: createMergedSession() seeds the fork with projectRoot-based
shellCwd and an initial terminal tab at projectRoot, but the code only copies
session.cwd and session.fullPath into newSession; update the fork to preserve
the source working dir by also copying the shell/terminal working directory:
assign newSession.shellCwd = session.shellCwd (or session.cwd if shellCwd is
undefined) and update the initial terminal tab's working dir (the tab object
returned in newSession.aiTabs[0] or the initial terminal tab structure) to the
source session's cwd/fullPath so the forked terminal opens in the same
subdirectory.
- Around line 73-84: The new fork is being seeded with a single synthetic entry
(userContextLog) so the forked tab loses the original turns; change the
createMergedSession call so mergedLogs contains the actual sliced conversation
entries (the array holding the original turns up to the fork point) instead of
just userContextLog — e.g., use mergedLogs: [forkNotice, ...slicedLogs] (or the
existing variable name that holds the sliced logs), optionally appending a
context message if needed, and remove/replace userContextLog accordingly so
replay/delete/inspection operate on the real copied history.

---

Nitpick comments:
In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Around line 12-17: The callback handleForkConversation inside
useForkConversation is unstable because it closes over the sessions array,
causing it to be recreated on every streamed log update; change it to not
capture sessions directly by using a stable ref/getter for current sessions
(e.g., sessionsRef.current or a store getter) and wrap handleForkConversation in
useCallback with minimal deps, then update state via the functional updater form
of setSessions and setActiveSessionId as needed; ensure you only reference
stable symbols (useForkConversation, handleForkConversation, sessionsRef/current
getter, setSessions functional updater, setActiveSessionId) so memoized
transcript items no longer re-render on stream updates.

Verify each finding against the current code and only fix it if needed.

Duplicate comments:
In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Around line 79-90: The fork currently seeds createMergedSession(...) with only
forkNotice and userContextLog (mergedLogs: [forkNotice, userContextLog]) which
stores a synthesized prompt instead of the actual conversation; change
createMergedSession(...) to pass the sliced/copied conversation logs (the array
you produce when slicing the session up to the selected message) as mergedLogs
so the new session contains the real transcript; keep contextMessage
(userContextLog) for spawn.prompt or whatever field uses the synthesized prompt
but do not replace the mergedLogs with it — update the call to
createMergedSession(...) to use the slicedLogs/copyOfLogs variable instead of
[forkNotice, userContextLog] and ensure spawn.prompt (or equivalent) still
receives contextMessage.

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Line 53: The fork name uses the wrong prefix; change the string assigned to
forkName in useForkConversation (the line creating const forkName = `Fork:
${sessionName}`) to use the documented prefix "Forked: " (i.e., const forkName =
`Forked: ${sessionName}`) so the new session/tab label matches the spec and any
tests relying on that exact text.
- Around line 109-114: The fork logic is copying agent overrides but omits the
customEffort field, so forks lose the source session's effort override; update
the fork code where newSession is populated from session (the block assigning
customPath, customArgs, customEnvVars, customModel, customContextWindow,
sessionSshRemoteConfig) to also copy customEffort (i.e., set
newSession.customEffort = session.customEffort), and make the same change in the
second analogous location that populates newSession from session.
- Around line 37-46: The serialized context currently filters and maps
log.source only for 'user', 'ai', and 'stdout', which drops 'tool' logs; update
the filtering in useForkConversation (where formattedContext is built) to
include logs with source === 'tool' and adjust the mapping logic so that
log.source === 'tool' maps to the role label "Tool Output" (keep 'stdout' also
labeled "Tool Output"), ensuring tool results are preserved in the forked
prompt.

---

Duplicate comments:
In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Around line 86-90: The fork currently seeds the new tab with mergedLogs:
[forkNotice, userContextLog], which collapses history; update the
createMergedSession call to include the real sliced history by replacing or
appending mergedLogs with slicedLogs (preserving forkNotice/userContextLog as
synthetic context if desired) so the new session/tab (variables newSession,
newTabId) receives the actual slicedLogs rather than a single synthetic entry;
ensure the mergedLogs argument uses slicedLogs (or [...slicedLogs, forkNotice,
userContextLog] if you want synthetic prompt plus full turns) when calling
createMergedSession.

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Around line 94-98: The new tab is set awaitingSessionId = true when spawning a
provider session (newTab in useForkConversation), but the error/catch paths only
reset state and thinkingStartTime so awaitingSessionId remains true and the fork
UI can get stuck; update the spawn failure handlers (the promise rejection/catch
blocks handling the spawn in useForkConversation, and the other similar catch
around the later spawn flow) to also set newTab.awaitingSessionId = false (and
clear any related flags) so the tab is not left permanently awaiting a session
id.

---

Duplicate comments:
In `@src/renderer/hooks/agent/useForkConversation.ts`:
- Line 53: The session label uses the wrong prefix: change the forkName
construction in useForkConversation (the const forkName = `Fork:
${sessionName}`) to use the documented prefix by setting it to `Forked:
${sessionName}`; search for any other uses of the `Fork: ` literal in
useForkConversation and replace them with `Forked: ` to keep labels consistent
with the spec.
- Around line 35-46: The filtered context currently excludes logs with source
'tool', causing tool outputs to be dropped when building formattedContext;
update the filter on slicedLogs in useForkConversation (formattedContext) to
include log.source === 'tool' alongside 'stdout', and adjust the role mapping so
that both log.source === 'stdout' and log.source === 'tool' map to 'Tool Output'
(keeping 'user' -> 'User' and 'ai' -> 'Assistant').
- Around line 79-90: The mergedLogs passed into createMergedSession is currently
only [forkNotice, userContextLog], which drops the original turns; change it to
include the sliced conversation turns up to the selected message (e.g., use
slicedLogs or the variable holding the copied turns) — optionally prefix with
forkNotice — so createMergedSession({ ..., mergedLogs: [forkNotice,
...slicedLogs] }) (keep userContextLog only as the spawn prompt if needed) to
ensure the forked session UI contains the original history for
replay/delete/inspection.